Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: the signer config (backport #138) #140

Merged
merged 2 commits into from
Sep 23, 2024
Merged

fix: the signer config (backport #138) #140

merged 2 commits into from
Sep 23, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 23, 2024

Context

  • fix the key and password file path missing in the signer
  • considering TLSConfig missing
  • add templates

Reviewers

  • @Lagrange-Labs/lsc-core-dev
This is an automatic backport of pull request #138 done by [Mergify](https://mergify.com).

@mastereng12 @mergify
fix: the signer config (#138)
7118cf1 
* fix the signer config

* update README

* minor fix

(cherry picked from commit 0447937)

# Conflicts:
#	cmd/main.go
@mergify mergify bot requested a review from a team September 23, 2024 17:40
@mergify mergify bot added the conflicts label Sep 23, 2024
@mergify Mergify
Copy link
Author

mergify bot commented Sep 23, 2024

Cherry-pick of 0447937 has failed:

On branch mergify/bp/release/v1.1.x/pr-138
Your branch is up to date with 'origin/release/v1.1.x'.

You are currently cherry-picking commit 0447937.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   README.md
	modified:   config/config.go
	modified:   config/default.go
	new file:   templates/docker-compose_signer.yml
	new file:   templates/signer_config.toml
	modified:   utils/docker.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cmd/main.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Sep 23, 2024
Merged
@mastereng12 mastereng12 merged commit b887a29 into release/v1.1.x Sep 23, 2024
3 checks passed
@mastereng12 mastereng12 deleted the mergify/bp/release/v1.1.x/pr-138 branch September 23, 2024 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kashishshah kashishshah kashishshah approved these changes

Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kashishshah @mastereng12